From: John Wiegley <johnw@newartisans.com>
Date: Sat, 2 Apr 2016 21:51:33 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3287
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3d889773617a882fbee5992960cfe18866cddc34;p=emacs.git

Merge from origin/emacs-25

7c1802f * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50 * doc/man/emacsclient.1: Document +line:column option.
06495c9 Fix rare problems with echo-area display and multiple frames
f99b512 In M-%, avoid making buffer-local binding of text-property-de...
---

3d889773617a882fbee5992960cfe18866cddc34